test bd37e118-c783-4d73-acf2-93f309b3a22a (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote