Class resolution change [AMECHE-327]
Threading SipFactory into call path [AMECHE-327]