r1638 branch change-itr cleanup