Merge branch 'streamer-worker-registry' into 'develop'