Danny Ainge, the Celtics president of basketball operations, said guard Isaiah Thomas has begun conditioning work, is on the court again and should be ready for the start of training camp.

A hip injury sidelined Thomas for the final three games of the playoffs.

“Isaiah is making good progress,” Ainge told the Boston Globe. “He’s out on the court, he’s shooting. He’s full-speed ahead on the stationary bike and working in the swimming pool. He’s progressing nicely.”

Thomas hurt his hip during a March 15 game against Minnesota and was sidelined for two games. During Game 6 of the second-round playoff series against the Washington Wizards, Thomas re-injured the hip, but he was able to score 29 points with 12 assists to help the Celtics win Game 7.

After making just 7 of 19 shots to score 17 points in Game 1 against the Cavaliers, Thomas was 0 for 6 and had only two points in 18 first-half minutes in Game 2.

Thomas was unavailable for the final three games.

“The Eastern Conference finals, that’s the biggest stage I’ve ever been on,” said Thomas after the series ended. “To not be able to go back out there in that second half and continue the series was painful. It hurt me, but Danny was right there. I couldn’t get past him.”

Thomas has met with several doctors since the end of the season, and the plan was to wait for the swelling to subside before determining what to do about the hip.

“(Surgery is) not the No. 1 option right now, but it could be once the swelling goes down,” Thomas said in May. “They want to let it die down a little bit and take another MRI once everything is down and looks back to normal and we’ll go from there.

Surgery has been ruled out, and Thomas is expected to be at training camp when it begins the last week of September.

Thomas was in Boston earlier this month helping to recruit free-agent Gordon Hayward.

Thomas was recently spotted at the WNBA All-Star Game in Seattle, near his hometown of Tacoma, and was in the stands to watch the Red Sox play the Mariners in Seattle earlier this week.

MAGIC: Free agent guard Arron Afflalo is rejoining Orlando.

The Magic announced the signing Thursday but didn’t disclose terms. The 11-year NBA veteran who shot 41 percent from beyond the arc for the Sacramento Kings last season gives Orlando leadership and 3-point shooting.

Afflalo had his best two seasons in the league with the Magic. He averaged 17.4 points, 3.7 rebounds and 3.3 assists with Orlando in 2012-14.

He averaged 8.4 points and 2 rebounds with the Kings last season.