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

Bringing commits from @favrik contributions.