Merge remote-tracking branch 'upstream/patch_fix_crash_in_nox' into main