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