Diff requested by victorargote - related to Job #19516.diff