test a039aab2-64be-4565-91d3-e15b7b8b7450 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote