Merge "Add new vendors" into jb-mr1-dev