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