I have Canola installed with Diablo, and it seems to be behaving fine. Don't forget to backup your settings before flashing.

-hal