Closes #2105 What problem is this PR intended to solve? #2105 Have you included adequate test coverage? No functional changes Does this change affect the C or the Java implementations? Only CRuby