Merge branch sign-in-out