Moved back to core workaround complex dependencies. Will wait for ERD fix.