Upstream issue: https://github.com/opal/opal/issues/2666 Upstream PR: https://github.com/opal/opal/pull/2667