Tennis star Marion Bartoli and presenter John Inverdale - who famously caused uproar when he said that the French player was "never going to be a looker" - are set to reunite in the BBC's Wimbledon coverage.
Reigning Wimbledon champion Bartoli, 29, who announced her retirement from the game last summer, has signed up to join the BBC commentary team.
Presenter Inverdale, who has been replaced by Clare Balding as the host of Radio 5 Live's Wimbledon coverage, returns to present Today At Wimbledon on BBC2.
Bartoli will be working across TV and radio and will be among the rota of pundits joining Inverdale on Today At Wimbledon.
Inverdale, 56, sparked a row last year when he said, on Radio 5 Live, that Bartoli, who had just won the 2013 ladies final, was "never going to be a looker".
He apologised to Bartoli at the Wimbledon champions' dinner for the remark, which sparked around 700 complaints and even prompted intervention from then-culture secretary Maria Miller.
Bartoli said she was not bothered by the comment and the pair both signed up to commentate for ITV on the French Open.
TV favourite Boris Becker is not on the BBC Wimbledon team this year, after taking on a job as head coach for Novak Djokovic.
British number one Laura Robson, 20, who is not playing following wrist surgery, will also join the team, alongside regulars such as Tim Henman, John McEnroe and Martina Navratilova, who made her debut on the commentary team last year.
Sue Barker returns for her 21st consecutive Wimbledon as anchor of the coverage on BBC1 and BBC2.
The BBC's line-up of pundits also includes Tracy Austin, Pat Cash, Lindsay Davenport, Goran Ivanisevic, Richard Krajicek, Mary Pierce, Andrew Castle and Virginia Wade, while 12-time grand slam champion Jimmy Connors returns for TV.
More than 17 million people watched the BBC's coverage of Andy Murray's victory in last year's Wimbledon final.
The BBC said it would air 150 hours of TV coverage, more than ever before, beginning on June 23.