test 6d8cf6a1-1a84-4167-b887-94e0736760e7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote