Fix the members separation for Bp 1.7+
Merge branch 'master' into activity-experiment