ION-Doubleshot: Updates from upstream