Merge branch 'main' into update_lc3plus