Merge changes I296d39be,I67bccf82