test fbdc87d3-cfb4-4902-a8bc-4f59799cde19 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote