test a533e5e0-5876-4056-bb90-bf28f453e72e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote