test 39df6d86-df63-4f51-b1d8-d8402cd393a6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote