Merge changes I54ea0dc6,If352b7db,I7b8221ac,Idcfb7c5d