CLC-3520 Fix Units column alignment for future classes
Merge pull request #2323 from raydavis/raywip

CLC-3520 Fix Units column alignment for future classes