Issue #2650198 by legolasbo: Incorrect operations when entity type has only one bundle a identical machine_name