Merge branch 'main' into fix_issue_1329_alt