Initial pluginsync_filter import
Merge branch 'feature/0002-pluginsync-filter' into deploy/3.7.1