Update to r42865

Also add some documentation