Merge "Settings recovery support"