Merge pull request #167 from kordero/19690

Code Review for Job #19690
quick fix for pr 167
Merge pull request #168 from joanneci/19736

quick fix for pr 167
relocate line that caused add job error
Merge pull request #169 from joanneci/19736

relocate line that caused add job error