Update for H22

Closed R01 requested to merge update-h22 into master

Merge request reports