NXP-12625: Add Computer Group with Label management
cleanup