Merge remote-tracking branch 'origin/main' into 1324_reintroduce_switch_and_disable_it