Merge "Restore overhaul"