test 93f56944-3bae-4ee5-8644-7c355676a4c9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote