Origin validation fix
Merge branch 'master' into feature/cr-auth
Update changelog; Cancel auth timer upon successful auth
Remove auth timer cancel, not working