Vendor: Moved to dev. tree