Merge changes I7dcf500e,Iad756c3f,I8e898d86