Updating release-next with minor changes