update to r42925