Merge changes Id19fc95a,I83a73ed1