Wip to next version and fix for change in CanaryUtil