test 98d2e509-fed8-4092-9009-6a001140acad (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue