Hello, patch #15 working in Drupal 11.1.2.
The patch at the comment #20 work for me in version 8.x.3.4 since update to D 10.4, other version for this module not work a patch for me.
I'm waiting apply this patch, since update to Drupal 10. i could grantee it's work in Drupal 11.1.2 whit version 8.x.3.4. if merged to dev i will test quickly and i will send my feedback.