test e9cdf150-e8d6-4fcb-9757-681a4091b398 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault