Keeping vendor tree in sync with master

No and No.