#74 #75 upgrade of rivers to latest versions