merge fix from release-27