Merge branch 'lmp-docs' into lmp-mr1-ub-docs