Merge branch 'release/dot1'
Didn't realize master was broken:
Requester was waiting for a channel was was never going to be populated