Issue #2981225 by maxocub, RumyanaRuseva, mpp: Migration fails to create instance when non-bundleable entity type exists (cherry picked from commit 68c7b00c)
