Merge branch 'pitches' into sonots
Merge branch 'actor_in_filter_plugin' into sonots