Merge "Fix build." into lmp-dev