Merge remote-tracking branch 'origin/main' into fix/settings-numeric-fields-and-general-runtime-guards