merge from release-51