Vivo module isolation - WIP
Merge pull request #1 from dlu-gs/develop

Vivo module isolation - WIP