Issue-Ref: 4229
Issue-Url: af3#4229

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