Merge branch 'Tachi107-fork-cxx_64_32' into dev