test 16948aeb-f60f-42d0-8a68-3f94a963fe14 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote