Merge "Add a CLI entry point for wipe recovery command" into main