merge from release-48