Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev