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