Merge changes I072c0f61,I798401f4,I9648ef55,I7225d9fa,Ife682288, ... into integration