Merge "Fix calico configuration"