Fixes #6807
Merge pull request #6813 from mwerezak/binary-talk

Fixes #6807