hot fix
Merge remote-tracking branch 'upstream/master' into cron_mage_processing
made changes to conform to product table.