Address alters

nicxvanrequested to merge
issue/drupal-3484754:3484754-ordering-of-alter into 11.x

Closes #3484754

Merge request reports