Merge "Fingerprint data is now stored in one of two ways depending on the"