Merge "Implement enumerate in FingerprintService" into oc-dev