eri: update from shamu