Diff requested by joanne - related to Job #19353.diff