Merge "Updates and additions to handle aarch64"