Merge branch 'main' into adding-new-tests-to-improve-code-coverage-and-fix-santizer-issues