Merge pull request #958 from shenrie/master

Fix for support of create devices
Refactored create_data_product to enable UI