Merge changes I8598d0bd,I560c2072