[LPKPTRB-748] 1) addresses P1 bug identified in this associated WB ticket
Merge pull request #39 from LPKPTRB-748 to master

* commit 'f2e5bde7536151738cedc29b3f477cad8ec613f5':
  [LPKPTRB-748] 1) addresses P1 bug identified in this associated WB ticket