Merge pull request #147 from ncatanchin/19763

Code Review for Job #19763