Merge branch 'main' into ci/encoder-prm-files-refinement