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