test 70da8d68-4799-4aa5-84aa-425b21fbcbd1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue