Merge "plugin: update controlParams at takeFilters()" into main