Merge "Fix settings restore"