Merge branch 'master' into develop
Fix state
Refactoring
Refactoring
Refactoring