test 40ee1760-4f98-490b-8672-410406101c80 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote