Code Review for Job #18120

Code Review for Job #18120 - Workitem available at https://www.worklist.net/18120