The talk around the San Antonio Spurs last year revolved mostly around Kawhi Leonard's injury situation and when or if he would ever be back with the team. It sounds like a lot of the rumors involving Leonard being traded were overblown, and the Spurs are going to try and mend the fences this offseason.

Shams Charania joined Chris Mannix on Yahoo’s NBA podcast on Thursday and laid out what he expects to happen this summer between Leonard and the Spurs. Leonard is finally getting healthy, and he is expected to be 100 percent by the time training camp rolls around, and he expects that to be in San Antonio.

Live and breathe the NBA?

🚨 Get viral NBA graphics, memes, rumors and trending news delivered right to your inbox with the Clutch Newsletter.

“Kawhi Leonard didn’t necessarily ‘go rogue’, despite all the reports. He was working out with San Antonio staffers during the season and now going into the summer, his rehab has continued. He’s been around. He went to Gregg Popovich‘s wife’s service shortly after the season ended. People close to him, they made it clear he was there. He interacted with Spurs’ officials, with staffers.”

Charania also said that just because the relationship is getting better there is still going to need to be a sit down where both sides hash out the differences and make sure that everyone is on the same page moving forward. After that happens then the two sides can start working out a contract extension. Without a sit-down meeting at that point, there is no chance an extension will be able to work because Leonard and the Spurs are still at odds over some things.