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