completing 8.2.4
Merge branch 'sign-in-out'