Incorporate recent upstream changes