test 0f17ca05-42b6-45db-8510-81e05eed3dd4 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue