Pre-build merge for 7.0.1-rc-2

Some post-merge tidy-ups for 7.0.1-rc-2