Imported all the in-production changes from vcap-common