test da5ebeb5-c628-4081-bcd4-791847441e39 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote