merge from release-49