The Toronto Raptors and James Johnson have agreed upon a two-year, $5 million contract.

The Memphis Grizzlies had interest in re-signing Johnson, while the Utah Jazz and Houston Rockets were also involved.

Johnson previously played with the Raptors between 2010 and 2012.