Stop premature update of membership data
Merge pull request #2246 from opf/hotfix/17510_premature_update_of_membership_data

17510 Stop premature update of membership data