Squashed 'Emas/' changes from 90bf421..bbc71f5

bbc71f5 prod-Emas: Updated prod version of Emas at version 0.7.

git-subtree-dir: Emas
git-subtree-split: bbc71f547b84369ab2e7f36b9ded0c6622e44412