Merge changes I8dc2b4df,I09e448f4