Merge changes I9e5de440,I0e9179aa