Merge "Fix docs build" into lmp-mr1-dev