sync up with RI/API updates.