Merge remote-tracking branch 'origin/main' into basop-2512-wrong-shift-in-ivas_spat_hspatparamrendcom_config_fx
