test 6ab77e92-e32b-4f0b-be43-b6347b152dc6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote