21.0-pre.5; Move enriched doc to the core distribution