Merge "Fix docs build" into lmp-dev