San Antonio Spurs star Kawhi Leonard and head coach Gregg Popovich are set to smoothen up the rough edges of their relationship prior to the NBA Draft.

As posted by Rob Lopez of DefPenSports, Adrian Wojnarowski of ESPN said that the two will sit down in the offseason to try and mend their differences.

Chief in their agenda is Leonard's relationship with the Spurs organization, his teammates, as well as his five-year super-max extension worth about $219 million starting July 1.

If Leonard doesn't sign the extension before the October deadline, he will become an unrestricted free agent next summer.

Below is the clip:

Last April, Popovich was asked about Leonard's health status. As reported by Tom Osborn of the San Antonio Express-News, Popovich seemed clueless as to what Leonard and his health team are up to:

“I don't know when he and his group are going to feel like they are ready to go,” Popovich said before Sunday's game against Houston. “If I knew, he'd be here. When he and his group feel he's ready, then he'll be ready.”

The two parties have remained relatively mum about the apparent rough patch they're in. But their actions and how they answer questions from the media speak volumes.

Though Popovich may be at odds with Leonard, Danny Green recently shared his thoughts on the situation. He admitted that he has spoken to Leonard himself. As reported by Jabari Young, Green said:

He stresses the same thing to me as he stresses to (the media). There is no news. He says he wants to be a Spur and retire there. He said that to you. He’s expressed that. When I talked to him, he says he’s been with us, he’s always on board with us and (wanted) to be a part of what we did, and he’s trying to get right. But things may change.