merge from release-54