Merge "Fingerprint: Plumb enumerate support."