channels/tsmf: integrate pull request #2012