Messed up other merge request with rebase from 4.x: !11 so setting up a new one with a correct rebase from 4.x.
Pipeline showed one test error, so I had to fix two lines of code to address that
Closes #3394957