Merge "Fix RS doc build DO NOT MERGE" into lmp-mr1-ub-dev