No functional changes, mainly reformatting and import changes
enabled an automatic merge when the pipeline for ef3387de succeeds
mentioned in commit 70feb589
merged