Merge branch 'master' into login_function_only
Revert 1b76b9d..ff143ed

This rolls back to commit 1b76b9d1caa543ea1c0ab966d4a0b3897b2a6ec9.
first_commit
Merge branch 'login_function_only'