This marks vendor branch revision 252213 as merged, the actual code was committed in r245479. MFC after: 1 week