test 6acb031e-64b0-4b33-8dc1-98469bee5e68 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote