Merge branch 'enhancement/7978' into 'master'
re #7978 Enhancement/7978
See merge request aswi/aswi-2020/aswi2020vldc!17
Merge branch 'enhancement/7978' into 'master'
re #7978 Enhancement/7978
See merge request aswi/aswi-2020/aswi2020vldc!17