Code Review for Job #17715

Code Review for Job #17715 - Workitem available at https://www.worklist.net/worklist/workitem.php?job_id=17715&action=view