test d6ede11f-e294-4ab5-b2d9-50e4b1a1ac85 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote