Merge "Fix build break" into lmp-ub-dev