test 078d13f5-bfc0-407d-bdf2-62aed6818fbb (rebased onto develop)



This is the same as gh-6016 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testRemote