test b9620ede-01a1-47dc-94a3-f688c7d9a819 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote