test 02972586-eaf5-43a1-894a-5d4dada9f929 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote