Merge pull request #709 from micmac1/1907-sccp-mwi