WIP: 2.0 EE config changes

In response to issue #1329