Old changes
Merge branch 'configurable' of https://github.com/li-chen/ee into configurable