test e603e2e7-3ccf-445d-aff5-689c517ce17a (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue