test 553925b6-f77e-4d11-b2a9-c3f4a3dea56a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote