Merge branch 'release/0.3.36' into develop
Merge branch 'develop' Unite the streams