Merge "fix broken GPL build" into lmp-dev