Resolve #3467599 "Update braces and ws"

spokjerequested to merge
issue/drupal-3467599:3467599-update-braces-and-ws into 11.x

Closes #3467599

Merge request reports