Merge changes I405a2317,Ifbaf2447,Ief534eaa