Merge branch 'cherry-pick-fd32ff61-2' into 'releases/3.4'

Merge branch 'fix/deprecation-warning-reordering-dof-mapper' into 'master'

See merge request !2743
1 job for releases/3.4 in 33 seconds (queued for 5 seconds)
Status Name Job ID Coverage
  Check Status
passed check-pipeline-status #26123

00:00:33