Diff requested by leo - related to Job #19335.diff