Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop'