test 938303e2-d77c-4d06-8873-c20c7558d1be (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote