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