Update Issue 144

JSIP-475 backporting to masyter - fix validated by customer

(cherry picked from commit 533573f5085529a04dd970b8daf744a4203931c1)