Fix bug with cyclic dependencies between join entities during persist and merge operations