vendor changes
completed merge