test 9cb1f562-3894-44e4-a6aa-6c8be5265508 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue