Patch #15 Tested and Applied successfully on Drupal 9.5.x. It's working on Dr...