Some upgrades
Allows to models and versions have empty price
Merge branch 'master' into qa