WP-3013-1 Resolving a few issues that came after the last integration
WP-3013-1 A little more clean up to remove some delete field cruft
WP-3013-1 Fixing a feature export issue, where the widget was incorrect