Merge "Fingerprint suggestion should not be dismissed until fingerprint added" into oc-dev