Close button fix
Merge branch 'base-from-develop' into develop
Add auto login.