Version history for #3215
Merge branch 'V7_8-branch' into V7_9_3-branch