test b31d8e90-2e51-46ef-9a72-eea49762e854 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue