#19632 Cleanup
Merge pull request #81 from ncatanchin/19632

Code Review for Job #19632