Fix PRODUCT_TYPE not being properly propagated from Group XML