test 21835b52-5a17-4700-b178-dcaa6194f7c1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote