Merge "init: 64-bit build issue" into klp-volantis-dev