WIP:Completing defines
Merge branch 'addConfigUseFiles' into bender-master

* addConfigUseFiles:
  WIP:Completing defines