Merge changes I55667cbb,I94073183,Ib87cc0ec