Merge "Parts of ARM64 should not be enabled, yet"