CBSA to retain in-bond option for cross-border carriers