Merge changes I8e90a7d5,I25249fe8