Follow CRuby r42455 [Feature #8693]