Merge branch 'master' into wip_alan_T6027_group_memberships_on_users_list