Merge "Fix canadian build"