test bbe1ac71-273f-42d7-9134-be5e21f36502 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue