test f7a4f9a3-2f38-424e-b4e1-ce3b035bcfe5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue