Dev 1099988 ws

Simon Will requested to merge dev_1099988_WS into dev_2022_2

Merge request reports