Merge pull request #6242 from kurund/set-membership-defaults