Merge "Fix the build" into lmp-mr1-dev