Merge pull request #7030 from daverodgman/sizeof-brackets-2.28

Backport 2.28 - Sizeof brackets