Closes #1657 Co-authored-by: Marek Posolda <mposolda@gmail.com> Co-authored-by: Markus Till <markus.till@bosch.io>