Merge "Re-add the block of text explaining the feature." into oc-mr1-dev