OK, I’m wary about landing the comparable change in Scala before I get a chance to smoke-test it. The code is verrry similar to the Java code all said. @witty-crayon-22786