PIM-2589: Addressing comments