merge changes to plugin batch workers && engines