Code Review for Job #20017

Code Review for Job #20017 - Workitem available at https://www.worklist.net/20017
@AndrewMeadows - is this the build buster?