Merge changes I00b02c80,Icf854fba,I41a7ea89,I3c9b75ba