MB-9163 fixes
Merge pull request #98 from gwenonacouch/stage

MB-9163 fixes