Issue-ref: 4422
Issue-URL: af3#4422



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