Fixed a bug with generation of the marketplace prices
Merge origin/master