update to match upstream patch merge