Merge changes I629c0bbd,Ia47c3163