Util fix and Lookup function

@bug W-2236106@

@rev goliver@
Merging origin/goliver/master-pending-pr78 into master