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