Merge "directiotest: 64 bit compile issue"