closed #1318
fix test data
closed #1317
closed #1316
fix translations
small fix
Merge branch 'master' into dev
#1300 tmp
#1300
#1217
#1217
closed #1309