merge from release-44