(cherry picked from commit 22a9ffbb9d)
22a9ffbb9d
This constitutes a large change in how we will parse different data formats going forward (for the plugins that support it) This is working off @henrypfhu's changes.