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