Hi,
we experience the same issue in our project. Your fix is great, simple and is working. Unfortunately, this causes hitches with ~400ms duration while doing origin rebasing. Do you have the same performance issue? Do you have a different solution in the meanwhile?