moving to product config
Merge branch 'chlee'