Importing what should be the final set of changes from Hybrid Core.  All further development should happen directly in this plugin.