test ed3ba054-d3e4-4586-b4df-7c863b645298 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote