Merge branch 'feature/8906_refactor' into 'master'
Re #8906 - Server and client refactor
See merge request aswi/aswi-2021/aswi2021virtual-surreality!18
Merge branch 'feature/8906_refactor' into 'master'
Re #8906 - Server and client refactor
See merge request aswi/aswi-2021/aswi2021virtual-surreality!18