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