Issue-Ref: 4276
Issue-Url: af3#4276

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