Merge branch 'julm' into membership_grouped