Diff requested by demenza - related to Job #19386.diff