test 87540065-f4ed-4bba-932a-5c187e43cf31 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue