Merge pull request #959 from shenrie/master

Refactored create_data_product to enable UI
Minor fix to prepare_data_product_support()