Merge "Fix crash in SipUtil" into lmp-dev