Merge "portability: Fix incorrect comparison between int and Integer" into lmp-dev