Merge remote-tracking branch 'origin/misc' into async