test 8c7dda1b-75db-4eea-b6c0-a969d58607c2 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue