Document #3574
Merge branch 'V7_9_6-branch'