Initial vendor commit..