Merge "Fix to get main SDNC pod to come up"