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