test 8050b4da-b379-4d84-8fc1-c43adca255fe (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote