Merge remote-tracking branch 'remotes/origin/main' into basop-2310-remove-unused-code-in-core-coder-cam
