test b83fb2ca-ac27-420e-b409-56c66fab496e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote