test 6779ffe0-51e4-4e4d-b80e-01fa563677c2 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue