Merge "Added variables to support seperate vendor patition."