test 6b61e361-e750-4f5a-bb4d-16fbdece54dd (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue