Patch added.
Also an extention to https://www.drupal.org/node/3068420.