This pull request should remain open until it is time to merge release/2.8 with the master branch.