TD-3868 Settings not migrated Properly