Branch best practice
Improve best practices
Improve best practices functional test
Improve best_practices locales
Merge branch 'master' into best_practices-refactor