test 8b1b7a21-9628-4d71-9370-18a18edb7eff (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue