Merge pull request #813 from jkczyz/2021-02-channel-monitor-mutex