test 8e13aaea-d7ca-401a-a1ac-8ff78f94fffa (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote