Merge the arm64-fixes-for-6.3 branch to avoid merge conflicts with changes for v6.4.
Attach a file by drag & drop or click to upload
