Port latest changes to release branch