merge down from release-22