(cherry picked from commit 9647ea88ea)
9647ea88ea
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.