Create backport for 1.12.2. A fork continuing from where Cleanroom team left off
No issues in this repository yet.