test 5e6f0f7c-5926-4036-8369-c85b230326e4 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote