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