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