merge from release-26