Merge changes I05e784af,Ie975a2ec