Merge "Bind fingerprint when we start authentication" into nyc-bugfix-release