Merge branch 'reauth-collision'