merge from release-40