test 73166166-dfa3-469f-bd6f-6ca9a122f372 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote