test 944b3682-fb18-4e3e-9464-3a0d7fdcc052 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault