test 37765324-535e-4795-962a-fc1eb4712c03 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue