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