Merge pull request #6538 from FireCulex/bonnie++