Merge changes Ib00583b2,I05815d4d,Ice0ee25d,Ic336a622,I6149a9c8 into stable/phosphorus