Merge branch 'vendor/BIND' into bind_vendor2