login state update
Merge branch 'master' into release