OZP-16 Merged group controller with others