Merge branch 'main' into basop-2248-basop-assert-in-evs-encoder