Changes from rahul17
https://www.drupal.org/project/form_alter_service/issues/3297260#comment-15015586 https://www.drupal.org/files/issues/2023-04-18/form_alter_service_d10-3297260-3.patch
Closes #3297260