Merge changes I8590352b,I164d60e0