Merge branch 'bc/doc-merge-no-op-revert'