Merge branch 'fix-group-membership-computed' into 'main'

Fix an error where expires_at and member_role_id were not computed

Closes #6463

See merge request !2405