merge from release-50