PIM-3078: Fix Datagrid BC Break