Merge "Fix build" into lmp-mr1-dev