test c71bf751-9b0a-42cb-b8c5-bd83422cc586 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote