Re #8306 architecture mergeMerge branch '#8306_architecture' into 'master'See merge request aswi/aswi-2021/aswi2021jmsd!4
Re #8306 architecture merge
Merge branch '#8306_architecture' into 'master'
See merge request aswi/aswi-2021/aswi2021jmsd!4