test 83351a00-f5bc-4f97-9ee9-54968852d373 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote