1.7 actual

Merging into the main branch in preparation for release.