FOOB-41 Merge branch 'FOOB-41_niffrig_hotfix' into release-1.0
Merge branch 'release-1.0' into develop