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