Merge branch 'override_symbols'

* override_symbols:
  let env vars override default symbols