test ac346e92-337d-4bbc-ba79-3bbbaee2c1a7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue