Merge changes I0283fc2e,Ib476d024,Iada05f7c into integration