Merge branch 'main' into fix-issue-1151-part2