SKU-1097 #comment potential fix for the removal of data sources issues