test 25d038af-4599-4193-a92f-0fce9493ca33 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault