merge from release-68