MB-9840 misc fixes
Merge pull request #69 from gwenonacouch/stage

MB-9840 misc fixes