Issue #2759157 by james.williams, nadavoid, drilix: Orphaned field collections no longer break update 7008