To avoid even more crazy merge conflicts (bitbucket PRs) I'd suggest we put off changing this file until 1.8 is released.