Merge remote-tracking branch 'origin/main' into 1892_remove_build_warning_in_main_on_windows