debug builds updated
Merge branch 'master' into dynamic-structure

* master:
  debug builds updated