Dev 1097956 ws

Simon Will requested to merge dev_1097956_WS into dev_2022_2

Merge request reports