Merge pull request #5303 from lambdageek/cattr-bcheck