Merge branch 'main' into increase-lc3plus-coverage