Merge "Adjust full restore API"