Update to revision 58458