Merge changes I4ea410ca,I78b037aa