Merge "fix build" into lmp-dev