Server-side: products ings hierarchy
Merge branch 'dev' into dev-test