Merge "config seg vid deployment"