Diff requested by marco - related to Job #19332.diff