test 653bb9b6-403b-4d54-9838-83820ba399cc (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote