Merge "Fix SDC deployment"