2.18 -> 2.19

Johannes Ederrequested to merge
4124 into master

Issue-Ref: 4124 Issue-Url: https://af3-developer.fortiss.org/issues/4124

Signed-off-by: Johannes Eder eder@fortiss.org

Merge request reports