Removed references to wfEngine
Merge branch 'master' into refactor-config