test 08b72476-09f7-47fd-ae76-adad66538760 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote