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