Short form for products
Merge branch 'short_form' into new_app2