Resolve #3508641 "Form backport"

Stephen Mustgraverequested to merge
issue/drupal-3508641:3508641-form-backport into 11.x

Closes #3508641

Merge request reports