Merge remote-tracking branch 'origin/main' into 1197-omasa-rateswitch-to-param_one_obj-uses-invalid-data-for-the-first-2sf