PIM-1340 : Resolve issue come from BAP for scope and locale used in datagrid manager