While this is marked as done, there is likely to be additional work as this is a large upstream contribution