[Mason] pmo changes