Merge branch 'main' into project/sdc