Correct type using for 32 and 64 bit architecture
Merge branch 'MyFork/master' into MyFork/master2

* MyFork/master:
  Correct type using for 32 and 64 bit architecture