Import 2.1.2 vendor code.
Merge branch 'vendor' to get 2.1.2 code.