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