Merge changes If3c9758c,I704fc2ee