Peter,
Ok, thanks Paul, Michael and Claes! I'll push it later today or early tomorrow after running some more tests (nashorn for example). If anybody else wants to comment, there's still some time (for example about the name of the package-private method)...
I'm late to the party :-) Don't worry, looks good to me as well.
Thanks for taking care of the bug! Best regards, Vladimir Ivanov
