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