Merge remote-tracking branch 'origin/forgot_password' into development
Merge branch 'development' into chat-retry