test 034300cb-405e-4abd-88ee-95c29cbad217 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote