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