Merge branch 'master' into development
Refactor messages save or update
Merge branch 'development'