test 497438fd-bbfa-4d9d-aa9a-cb27b28384a8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote