Local patches; aiming for acceptance at upstream