fast fix for shops
Merge branch 'develop'