Merge down from release-6