merge from release-39