Added manual_current_product_data_source_id