Merge "Remove dependency on vfc/db"