test 1798a53b-3e2a-4f2a-960c-587373cabbba (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote