Issue with merge from upstream

[en-sc]

While merging #994, I've selected the wrong option of rebase and merge.
As I see it, there are 2 options:

1. Merge these commits again as a part of the next merge from upstream (Merge up to 9659a9b5e28dc615dfb508d301fdd8fa426c191b from upstream #1008).
2. Revert the commits (as a squashed revert) and merge again (Revert #994 "Merge up to b9f5262d42f00c563750bfacea97640cda9afbdc from upstream" #1007 is the revert).

I am leaning towards the first option, since this affects the list of commits in the merge, but not the diff.

@JanMatCodasip, @MarekVCodasip, I would like to know your opinion on the matter.

[JanMatCodasip]

Hello @en-sc, the option 1 sounds fine to me, too. Thanks.

[MarekVCodasip]

First options seems ok to me.

[en-sc]

#1008 is merged. The issue is fixed.