test cf6a67c3-16b4-4cbb-89b5-431eec1a0660 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote