Needed upstream changes to debug node plugin and testing framework that was too difficult to cherry pick.
