ported from dev
Merge branch 'master' of https://github.com/sbushinskii/tradeshop