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