make modifications to scripts for x86 support #NoTesting
Added x86 support #WithTesting
Merge branch 'feature/x86-support' into develop