Merge "Update fingerprint strings during setup" into nyc-dev