What is the most match points saved by a tournament winner?

Recently Martin Kližan won ATP tournament in Rotterdam. On the way to the final he saved 8 match points (5 against Batistuta Agut and 3 against Mahut).

What is the record for the most match points saved by a tournament winner throughout the tournament? (What is the record for ATP tournaments, WTA tournaments, Grand Slams?)

---

We have a similar question about most match points saved in one match: Maximum match point saved in a tennis match? From the players mentioned there, Adriano Panatta saved 11 match points in his first round match at 1976 Italian Open and also won the whole tournament. The tournament was a part of the Grand Prix tennis circuit, which was a predecessor of the ATP World Tour.

Wikipedia list number of match points saved by Grand Slam winners here, although I am not sure whether the list is complete. (Here is link to the current revision of the article.)

According to this answer at Quora, Grand Slam record is 5 match points saved by Manuel Orantes at 1975 US Open. (However, no source supporting this claim is given there.)

This article on the ATP Tour website and also this tweet say that Kližan’s 8 match points is the most at an ATP tournament since 2001. But it is not mentioned who saved eight or more match points and still won the title in 2001.

EDIT: A recent article on ATP Tour website mentioned that Félix Mantilla Botella won 2001 Palermo after saving 9 match points in the semifinals.

EDIT2: On WTA tournaments, the highest number I have seen is 8 match points saved by Andrea Petkovic in 2015 Antwerp. WTA: Petkovic Caps Dream Week In Antwerp (Wayback Machine) At 2001 Miami, Jennifer Capriati lost in the final to Venus Williams, despite having eight championship points.