Merge pull request #1377 from okorach:stream-porject-config-extract

Merge pull request #1377 from okorach:stream-porject-config-extract #2068