Add missing entry for merge from cxx-conversion branch.