Updated patch, snapshot after upgrading to rivet 2.1.2