Port changes to release branch