Merge changes I18f5f27f,I27ec303f,I78009fe3