1.6.0 pre.2

This pull request tracks the next 1.6.0 prerelease

Let's try to get most or all of #598 done for this one :)

:+1: