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