Merge "SO datasource config update"