Issue-Ref: 3776
Issue-Url: af3#3776

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