test 4d863d26-2195-4ac9-9149-b1ecd144159c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote