Document #3601
Document #3597
Merge branch 'V7_9_6-branch'