Diff requested by kordero - related to Job #19267.diff