update for sccp next branch
Merge branch 'sccp-next'