Merge branch 'main' into 690-fix-compilation-for-split_rend_with_head_rot-disabled