Merge pull request #173 from kordero/19690

Code Review for Job #19690