Merge pull request #3257 from jix/tribuf-formal