Merge "Refactor fingerprint API"