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