Merge changes I8b1a0281,Ib6342c74