- Complete the changes from r1.42.