Product labels fix
Merge branch 'dev'