test eaad57b0-9604-4d54-aa20-d67ddaf6b699 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote