test bab90171-4a19-414b-8da9-2e4bcfd9e192 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue