additional patches. This patch is taken almost verbatim from PR 69853 which was submitted by Jake Hamby <jhamby@anobject.com>. I've applied it to jdk13 rather than jdk14 though.