Updating integration repo to fix #1810

both fixes gh-1815 and gh-1810 are good for me.