Merge changes I4ac3bc14,I470acb8b