RelNoteson commit Merge branch 'dp/merge-strategy-doc-fix' into next (317e077)
   1Documentation/RelNotes/2.17.0.txt