Merge branch 'main' into basop-2286-gcc_compiler_warning_Idx2Freq_Tbl