test 404eee22-1446-4172-863c-31f2c9f6ab78 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote