Merge branch 'main' into 2452-hq-core-harmonization-issue-peak_avrg_ratio_fx-in-lr-hq