added support for upstream stanzas
Merge branch 'features/upstream'