merge from release-38