This changes works for me too. I would say that it is good to merge.
I have applied Patch#2. It fixed the issue with field_group on Drupal 10 site
Ariun β created an issue.