Update to R38370