Catch up the develop branch to last released state

[nr-swilloughby]

In the previous release, some minor changes were pushed out to master but weren't merged into develop. This fixes that.