The patch is based on the version of upstream PR#9 that was actually merged.
The patch is based on the updated, approved version of upstream PR#9.