Code Review for Job #19747

Code Review for Job #19747 - Workitem available at https://www.worklist.net/19747
please remove this commented line if you are sure that this is working, we can revert from history in case we need it