Merge "Fix ulong" into lmp-dev