missing code in last MR related to precommit fix and lint all the things
/cc Mathias Göbel, Frank Schneider, Michelle Weidling