test 68a3e8a3-e224-4972-9ca9-de69b32b1fdb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote