Merge "Implement recoverKeys"