Merge remote-tracking branch 'origin/main' into dev/hide_unwanted_theming_settings_options