Final commit to v8.5 branch for reference before branch was deleted