Merge "Added new fingerprint metric categories." into main