Updated with 2.5 and 2.6 ROV changes