test 3e5a9389-497d-4eb7-a1ad-65e400eebbea (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote