Mind breaking the RI changes into another Pull Request (in another branch) -- I was able to reset / remerge locally, but then I won't get your changes :)