Merge branch 'enhancement/7886' into 'master'
Enhancement/7886
See merge request aswi/aswi-2020/aswi2020vldc!10
Merge branch 'enhancement/7886' into 'master'
Enhancement/7886
See merge request aswi/aswi-2020/aswi2020vldc!10