Problem: Patch-5 is corrupted

creating fresh pull request with patch-5 changes for merging to zmqpp/develop because wrongly squashed patch-5.