Patch #8 works for us as well.
+1 RBTC
Also confirming on my end that patch in comment #24 works in drupal 9.5..3