test 51e6b550-a8da-456f-b947-a2d538d3e8cb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote