merge from release-66