Thanks a lot for looking into that, Ihor.

However, I wasn't able to fix the bug here. Very likely, I did not "install" the fix correctly as I'm not sure how to go about it - or else it's not a complete fix yet.

Here's what I did:

1. Downloaded org-cycle.el and org-fold-core.el via the link you sent
   
2. Verified those are the correct files (found the changes in the files that were highlighted in green on the git page)
3. Copied both files over the ones in my c:\Users\PK\Documents\emacs_config\.emacs.d\elpa\org-9.6.1\ folder
4. Restarted Emacs
   

Yet, the issue still occurs in the sample file I sent you.

Did I do something wrong?

Many thanks!

Philipp Kiefer <phil.kiefer@gmail.com> writes:

I can reproduce with this minimal init.el using Emacs GNU Emacs 27.2 
(build 1, x86_64-w64-mingw32)
  of 2021-03-26 and Org mode version 9.6.1:

Thanks for the reproducer!
It is rather an edge case.
Fixed, on main.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=18a146a9d