test e7350606-c93e-4321-88df-9a8f0cb2d4be (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote