Merging latest developments back to `develop` #5

Closed nfgrilo closed 5 years ago