Merge "Fix fugu build" into lmp-dev