Added in a broadcast filters once they have all be rendered
Merge branch 'dev'
Merge branch 'master' into dev