Merge "minor fix on x86_64 only 64bit guest" into tm-dev