merge from release-27 branch