Issue-Ref: 3394

Signed-off-by: Simon Barner <barner@fortiss.org>