test 11af389e-c57f-48f7-a683-b67dead7b3bc (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote