Merge branch 'master' into nitrat-tester
Fixed translate and bugs
Merge branch 'nitrat-tester' into nitrat-tester-with-products