Interim fix until Gerald's feature branch gets merged
Merge branch 'feature/connery/toggle-sandbox' into develop
Merge branch 'feature/grantb/US-804' into develop
Merge branch 'develop' into feature/connery/portable-synced