CRAFTER-1285: issue with multiple datasources