[LPKPTRB-752] 1) addresses P1 bug identified in this associated WB ticket