Various cleanup, cherry-picked from long task #71

enabled an automatic merge when the pipeline for 16604292 succeeds

aborted the automatic merge because source branch was updated

added 1 commit

• 8563e460 - clang-format

Compare with previous version

enabled an automatic merge when the pipeline for 8563e460 succeeds

merged

mentioned in commit c86080e1