Merge branch 'nm-reauth'