Update for all upstream changes