test 69e545eb-067e-43bb-9f0e-843599e4a381 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote