Flock more aggressively #3375
Merge branch 'V7_9_4-branch'