FS-7602 add some of 3b2d00f3 from verto to sip and refactor some code to keep sip working like verto