Marketplace does not show goods if quantity is 0
Merge origin/master