Switching to 64 bit
Merge branch 'feature-64bit' into develop
Merge branch 'develop'