backport from release branch