Merge pull request #6882 from rahku/arm64tests