Merge changes If2ef6c5c,I4b8e0a28