test 2d08aa9a-81ac-4b3d-887a-2ae6402bf934 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote