Fix issue in discarding newly created entities which has multi-level of nested children

Fix issue in discarding newly created entities which has multi-level of nested children #2069