Merge branch 'SamePageAuthentication' into dev