Merge changes I093fde71,I2dffd5df,I2ae6fa62