Merge branch 'main' into FhG/b_20230405_HO-DirAC