Merge remote-tracking branch 'origin/develop' into simplification

Fixing incomplete merge conflict resolution...