Code Review for Job #19760

Code Review for Job #19760 - Workitem available at https://www.worklist.net/19760
this is related to my previous comment so please revert this too