Diff requested by teddy - related to Job #19309.diff