test 0f547d7d-e239-4440-bafc-85963977252c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote