HHH-9171 : Orphan removal does not happen for new entity element