Merge branch 'ma/doc-diff-usage-fix'