Commits coinciding with toro telephony fixes