Fixed MB-10098, MB-9669, MB-9611
Merge pull request #119 from gwenonacouch/stage

Fixed MB-10098, MB-9669, MB-9611