Merge "init: 64-bit build issue"