Merge "Fix type for temp variable" into lmp-dev