Manually updating based on changes made as hotfixes to stable.