Merge branch 'main' into 2450-hq-core-harmonization-issue-fine_gain_pred_fx