Changes for arm64 architectures
Merge branch 'tmpDeatached'