Merge pull request #4902 from FernetMenta/buf