Merge branch 'NBC' into 'master'
Re #8832 Refactoring
See merge request aswi/aswi-2021/aswi2021tri-musketyri!9
Merge branch 'NBC' into 'master'
Re #8832 Refactoring
See merge request aswi/aswi-2021/aswi2021tri-musketyri!9