PIM-3078: Update Custom datasource due to BC break