Merge branch 'Working_branch'
prod issues
prod issues with password_hash