Issue-ref: 4338
Issue-URL: af3#4338



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