Merge "Fix kube2msb failure to start"