1.8.0-dev updates

**NOT READY FOR MERGE** waiting on #1290