Resolve #3495507 "System move procedural"

nicxvanrequested to merge
issue/drupal-3495507:3495507-system-move-procedural into 11.x

Closes #3495507

Merge request reports