Fixed MB-10112, MB-9733, and MB-9641
Merge pull request #108 from gwenonacouch/stage

Fixed MB-10112, MB-9733, and MB-9641