fix trackingcode
add product
Merge branch 'release/0.2.5'