Merge changes I49a760ea,I792df86e