* With minor cleanup Issue-Ref: 4314 Issue-URL: #4314 Signed-off-by: Simon Barner <barner@fortiss.org>