Merge changes I426a2bc1,I5440b866