Options massage move

Stephen Mustgraverequested to merge
issue/drupal-2171395:2171395-options-massage into main

Closes #2171395

Merge request reports