PIM-2696: Fix issue introduced in branch