Merge "Tweak restore API"