Needed to remove dependencies in Portal
Merge branch 'master' into release/0.13.6.2