Merge changes I90cacb1c,Ia0760a76