Merge "assert recovery finger/thumbprints, not system"