Move the changes from patch 3127116-31.patch to a Git merge request, add...
Move the changes from patch 3127116-31.patch to a Git merge request, add comments to the tests, and incorporate any modifications suggested by the reviewer.
Closes #3127116