Merge remote-tracking branch 'remotes/origin/main' into 20230615_foramtting_after_acceptation_of_switches