Must be done before version 7 work moves into a branch and we enter the final prep period for the version 8 beta. (Date tentative.)