PIM-2531: Fix