Merge pull request #116 from atlasapi/mbst-5505-nine-ex

MBST-5505 now/next
Merge branch 'master' into stage