test 28e192aa-553c-4bae-9943-2343f0c8211a (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote