Diff requested by wynton - related to Job #19397.diff