Port changes to release branch

No match.