Just to reinforce, a mirror of the 6.0.x branch is being used for product builds. This means that it is very important to keep 6.0.x branch stable. Please:

* Make sure any changes done to master that are relevant to 6.0.x are cherry-picked into the 6.0.x branch.

* Make sure that 6.0.x is building successfully after each commit. This is critical and even more important than master at this time, as it impacts not only our team but several teams downstream.

    Thank you,

     Edson
--