fix loggin failed bug
gMerge branch 'master' into production