Merge "Fixes for Work Challenge Fingerprint" into nyc-dev