FOOB-10 I am fixing the big problem assigned to me by John K
FOOB-10 Merge branch 'niffrig_FOOB-10' into develop