Co-authored-by: Jörg Hofrichter <joerg.hofrichter@emerson.com> Original-commit: f1ef9ada680dd6e8ca600d3c01551b0d1b6f52a5