Merge "Add recovery support of dynamic fingerprints"