Merge pull request #69 from joanneci/19621

Code Review for Job #19621