Diff requested by lithium - related to Job #19510.diff