Port latest changes to release branch

No match.