test 8a91cd30-f72b-475d-870e-32e625a8d288 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault