test a1c0b40d-ed98-40fb-8d1b-e204ccee950a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote