test 91423487-c804-4431-ae1e-b7aedd46cb8c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault