test 6a02cbaa-50a2-4bfc-9b19-5e53bc35e8a3 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote