See if this fixes it.
Merge pull request #10101 from KA101/braces

BUILDFIX: See if this fixes it.