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