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