Backported supervisor group fix