test f4b46b23-6f14-4b6c-878d-e1901da373c9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote