Merge changes I7d7323b8,Ib796cfee