Changes needed for Asterisk TRUNK 357721