test 84c0c070-0a69-4699-8c59-67fd8b7e2565 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue