Merge pull request #2293 from reaperhulk/idempotent-engine-add

idempotent engine add