Combined changes from rector and @dcam

David Cameronrequested to merge
issue/recipe-3602374:3602374-dcam-changes into 8.x-2.x

Closes #3602374

Merge request reports