Merge branch 'for-3.10-async' into tmp-async