1.7 snapshot

This has a MAJOR bug fix (for us) in it, so pushing away.  Will likely update once 1.7 hits main branch