INNOCENT: Add engine integration for upstream pluggable engine change.