Correcting the canHandle conditions.
Merge branch 'development'