test 4cdfe516-86d2-4930-aba2-67d7f13e4469 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote