2.21 -> 2.22

Andreas Bayharequested to merge
4276 into master

Issue-Ref: 4276 Issue-Url: af3#4276 (closed)

Signed-off-by: Andreas Bayha bayha@fortiss.org

Merge request reports