Merge branch 'main' into code-coverage-unhit-functions-removal