Merge commit '638c66de4a0faa4c2e815e81cd4021c2387c7e0f'

(cherry picked from commit c60f6422ffae3ea85e7b10bad950ad27c463af18)

Fixes bug in meta mode output capture.

Merge commit '787302bde4d89279180303b753eb73b9bc6820b9'

(cherry picked from commit b4894eca1ade4e9cec9afbe76021305d23bf914a)

Merge commit '3d772e596c1acf76f555c1f51fd8d834e56b0c35'

(cherry picked from commit a8c56be47166295d37600ff81fc1857db87b3a9b)

(cherry picked from commit 0b46a53a2f50b5ab0f4598104119a049b9c42cc9)

Merge commit '284d1f7d496806b18558ab55e4654fd5e96d6a3e'

(cherry picked from commit 759b177aecbfc49ebc900739954ac56b1aa5fc53)

(cherry picked from commit d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d)

Merge commit '5ad769f660f3d00853bc739f82d9bc62f6a682cb'

(cherry picked from commit 6a7405f5a6b639682cacf01e35d561411ff556aa)

Merge commit '84691af93185c692058ba55fa81a04103f5bf71b'

(cherry picked from commit 226192822cddc30cacecd55bccb48f39c653058c)

Merge commit 'dbb5be7f07456d02ce444484c683b130439acb45'

(cherry picked from commit 8d5c8e21c690b35d0a9a604d6b886fba222cd2fe)

Merge commit '29efb3dcaedd9cbabc6f96f35545baf2c8b28501'

(cherry picked from commit 9d3df31ec06fe91c5c67da464f11408474d57174)