Diff requested by mike7 - related to Job #19387.diff