merge from release-65