Code review request, fix for PATH setting bug 21322