Merge branch 'master' into membership_array_changes