[PATCH] Defer engine ops verification check