MSS-22 instance setup
Merge branch 'feature/MSS-22' into develop