Merge branch 'arm64' into v3