Merge "Fixing + testing group services"