Merge changes If3d86e80,I48763243,I656a6786