Co-authored-by: Thomas Peetz <thomas.peetz@cimt-ag.de> Reviewed-on: #98
(cherry picked from commit e57abdbef7e13e3880738cd639225df5db0c37be)