Merge "FingerprintService: check current user correctly" into oc-dev