Merge from feature branch

[ ] tim-kretschmer-c2fo