Merge pull request #3056 from BrzVlad/fix-multiple-binprot