Diff requested by monu - related to Job #19277.diff