Merge branch 'improve-Visit-system'
Merge with forgot_password_feature branch and resolve merge conflicts.