Merge branch 'tetyanochka-login' into login