test 6a268000-e17d-4852-94f3-7e2829e87f4d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault