CRM-10466 - Ensure token hooks are always called