Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev