test 2864d4e1-8c0a-4ae4-9870-5884c345238f (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault