am 2e238cfa: Merge "Add support for include_files"

* commit '2e238cfa31c8813809f8998100d1efe24b60473e':
  Add support for include_files