test 31f7d923-ad39-40ee-95b8-3b2a40957d57 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote