Merge branch 'feature/8740_server_refactor' into 'master'
Re #8740 - Server refactor
See merge request aswi/aswi-2021/aswi2021virtual-surreality!7
Merge branch 'feature/8740_server_refactor' into 'master'
Re #8740 - Server refactor
See merge request aswi/aswi-2021/aswi2021virtual-surreality!7