test 4a3550de-9701-4ebc-a5c4-df3b1d814c58 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote