[PRD-4216] Attempt to better support nested groups