FOOB-43 first

Commit 2 of squash
FOOB-43 review changes :(
FOOB-43 Merge branch 'FOOB-43_niffrig_noffff' into develop