Miami Heat guard Davion Mitchell will sign a two-year, $24-million deal to remain with the team next season, sources told ESPN's Shams Charania.

Mitchell joined Miami from the Toronto Raptors as part of the midseason multi-team blockbuster that sent Jimmy Butler to the Golden State Warriors. He averaged 10.3 points, 5.3 assists, and 2.7 rebounds for the Heat while starting in 15 of his 30 appearances.

He was set to become a restricted free agent this summer.

The 26-year-old was one of the Heat's most impactful players during their first-round series against the top-seeded Cleveland Cavaliers. He averaged a team-best 6.3 assists in the four losses and his 15 points per game ranked third behind franchise cornerstones Tyler Herro and Bam Adebayo.