Duplicate changes to master

Duplicate rapid fire changes to `develop` in `master`.