New patch added.
Also an extension to https://www.drupal.org/node/3068420.