Merge dev into main
enabled an automatic merge when the pipeline for d73df6f6 succeeds
merged
mentioned in commit e0ad4e3a