merge from release-59