Original MRs: !115 (merged), !120 (merged), !121 (merged)
(cherry picked from commit 5cf9c2e0)
Part of the #29 (closed) series