Straightforward merge from i386: remove support for global cli for x86-64
Attach a file by drag & drop or click to upload
