LHX 1.Modify login.
Merge remote-tracking branch 'origin/develop' into develop