Code Review for Job #19995

Code Review for Job #19995 - Workitem available at https://www.worklist.net/19995
@cozza13 Were you able to test on both OSs?