Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported