Merge "DO NOT MERGE Fix build" into lmp-dev