Changes in preparation for release 8.10.