fixed: MB-9788, MB-9496, and MB-10211
Merge pull request #102 from gwenonacouch/stage

fixed: MB-9788, MB-9496, and MB-10211