Falling back to slave name if friendly name is not found
Merge branch 'rtbuilderdetail' into staging