Merge "add --shutdown_after option to recovery"