test c70b6c36-b937-4ecb-b86e-cf752948becd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote